Bug 838011 - Add email address to contacts
Merge pull request #8907 from crh0716/838011_v1train

Bug 838011 - Add email address to contacts. r=asuth, alberto, a=leo+