Merge "Improve our validation of email addresses." into jb-ub-mail-ur10