fix warning about mailer constant already being set
Merge remote-tracking branch 'origin/master'