PHPMailer: Merge upstream commit (PR274).

props zodiac1978.
fixes #27946.

Built from https://develop.svn.wordpress.org/trunk@29783


git-svn-id: http://core.svn.wordpress.org/trunk@29555 1a063a9b-81f0-0310-95a4-ce76da25c4cd