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

DTP