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

DTT
Merge branch 'staging' into test