[IMP] Porting as-is to Odoo 8