Merge pull request #7565 from neheb/sendmail