[MERGE] Update from Odoo master branch