Commit: hashao CJK patch

[Dom Lachowicz]

Committed, and doesn't break anything for me. I hope it works for the CJK people.

On a related note, how confident does everyone feel about their respective
platforms? Is everyone close to release-ready?

Thomas? Mike & Michael?

Dom