Merge pull request #2 from odoo/8.0

8.0