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

Production push
Fix edge cases blocking emails from sending