Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	class.phpmailer.php