Merge pull request #1 from odoo/master

Sync from Odoo Base repo to my Fork Repo