[MRG]merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam