[MERGE] Merged from lp:~openerp/openobject-addons/trunk/