Merge pull request #3775 from brettsantore/dev

Add test for email address with subdomain