Merge pull request #826 from code-dot-org/test

DTP
Merge pull request #831 from code-dot-org/test

DTP
hotfix chinese locales