Merge branch 'hotfix/mailerfix'
Add smtpfix
Merge branch 'hotfix/stmpfix' into develop