Merge pull request #3288 from cshore/pull-request-msmtp-mta