Removed encoding workaround which caused unicode characters to be mangled.
Merge branch 'dev'

* dev:
  Removed encoding workaround which caused unicode characters to be mangled.