Merge pull request #823 from code-dot-org/staging

DTT
Merge pull request #825 from code-dot-org/staging

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

DTP
Merge pull request #829 from code-dot-org/staging

DTT
Merge branch 'staging' into test
Merge pull request #831 from code-dot-org/test

DTP
hotfix chinese locales
Merge branch 'test' into staging