fix for production
Merge branch 'mailer' into development
Merge branch 'development'