Mandrill updates
Merge branch 'Bremer' of https://github.com/robertsoniv/Bremer into Bremer