change mailer settings
Merge branch 'release/v1.1.5'