[MERGE] merge from odoo 8.0