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

DTT
Merge branch 'test' into staging