Merge remote-tracking branch 'origin/hotfix-0827' into gh-pages
从 chinaw3c 合并数据
Merge pull request #6 from Jinjiang/chinaw3c

从 chinaw3c 合并数据