Merge pull request #1021 from nupplaphil/phpmailer_fix