han extra charsets support
Merge branch '4.2/i18n-han-extra-support' into 4.2-trunk