[MERGE] branch merge with lp:~openerp-dev/openobject-addons/trunk-v62_config