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