Merge branch '8.0' of github.com:odoo/odoo into 8.0