Automatically built
Merge pull request #845 from code-dot-org/finished

deploy to delivered
Automatically built
Merge pull request #846 from code-dot-org/finished

deploy to delivered
Revert "Merge pull request #843 from code-dot-org/deprecate-username-for-new-users"

This reverts commit 430bef570b67cad216f585e77cceb2ba42866ff4, reversing
changes made to 1c0b2383adaecece09cc37a7cc9c1bd0ab5121b9.
Merge pull request #847 from code-dot-org/revert_843

Revert "Merge pull request #843"
Merge pull request #848 from code-dot-org/finished

deploy to delivered
Merge pull request #849 from code-dot-org/delivered

Deploy to production