[MERGE] Merge lp:~openerp-dev/openobject-addons/ron-dev-addons