comment out mailers
Merge branch 'master' into development