Merge pull request #1879 from sotux/master_zh_CN