merge odoo 8.0