When sending email, use a nicer entity name if available.
Merge remote-tracking branch 'atheme/master'