adds email type
Merge branch 'master' into 1.3
merge