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

DTP
Merge pull request #893 from code-dot-org/test

DTP
Merge pull request #895 from code-dot-org/test

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