MString adjusted for both unicode and non-unicode versions
Authored by: krishnapg 2014-05-21
Parent: [r596]
Child: [r598]