cherry pick of will's localization fix
cherry picked more tests than i wanted.  restrict to just will's change
Merge pull request #566 from code-dot-org/delivered

deploy to production