Merge pull request #1 from odoo/master

test pull request