More correct charset conversion.

Created by: akzhan

合并请求报告