Display email if available
Merge remote-tracking branch 'origin/master'