Removed ostringstream from EM_.cpp
Merge branch 'v2.4'