[Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons