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

DTP
Merge branch 'test' of github.com:code-dot-org/code-dot-org into production
Merge branch 'test' into production
Email
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging