[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-rework-addons-23-march-aag