special email address format support
Merge branch 'master' of us1.jiehan.org:/srv/git/peddie_communityservice