Merge pull request #2 from odoo/master

Update from original