Merged email_contact files from master branch.