hotfix
Merge pull request #582 from code-dot-org/locale_hotfix_master

Locale hotfix master