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

11/04/2014 DTP
hotfix -- typo
Merge pull request #338 from code-dot-org/production

backmerge hotfix