Bugfix for CoreMailer
Merge remote-tracking branch 'upstream/master' into MailerBugfix
Merge from master
Merge pull request #722 from jeroendesloovere/MailerBugfix

Bugfix for CommonMailer