Don't break UTF-8 strings on obfuscate.
Merge branch '4.0'