Merge pull request #374 from code-dot-org/finished

Deliver.
Merge branch 'finished' into delivered