[MERGE] merge from lp:~openerp-commiter/openobject-addons/crm-improvement/