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

DTP