Merge "Send new account and password reset emails post-commit"