am e1b1cdc0: am 92d7f9ff: Merge "Fix bug #6408393 Character corruption is caused when locale is changed" into jb-dev

* commit 'e1b1cdc0d45b23ad65819643ca135783ad17b976':
  Fix bug #6408393 Character corruption is caused when locale is changed