Merge pull request #288 from odoo-dev/saas-4-mass_mailing_fixes-tde