Merge pull request #349 from code-dot-org/staging

DTT
Merge pull request #350 from code-dot-org/test

DTP
Merge branch 'test' into staging