Updated an email constant
Merge remote-tracking branch 'upstream3/master'