Load mailer in email task
Merge branch 'production'
Merge branch 'master' into bundle-cache