Update: bugfix mailers, issue #68
Merge branch 'master' into build