PHPMailer 5.2.7

I've did a rewind of some mess-up I've committed in the past.
Now this branch should be OK for merge.