Merge pull request #3289 from cshore/pull-request-msmtp-scripts