[MERGE] forward port branch saas-6 up to 67c9e4f
[MERGE] forward port branch saas-6 up to 67c9e4f

bplancher/odoo,ygol/odoo,bplancher/odoo,hip-odoo/odoo,laslabs/odoo,hip-odoo/odoo,laslabs/odoo,dfang/odoo,bplancher/odoo,storm-computers/odoo,bplancher/odoo,bplancher/odoo,Elico-Corp/odoo_OCB,laslabs/odoo,Elico-Corp/odoo_OCB,laslabs/odoo,Elico-Corp/odoo_OCB,ygol/odoo,dfang/odoo,ygol/odoo,storm-computers/odoo,dfang/odoo,dfang/odoo,laslabs/odoo,Elico-Corp/odoo_OCB,storm-computers/odoo,ygol/odoo,hip-odoo/odoo,ygol/odoo,Elico-Corp/odoo_OCB,storm-computers/odoo,ygol/odoo,storm-computers/odoo,storm-computers/odoo,bplancher/odoo,dfang/odoo,dfang/odoo,hip-odoo/odoo,Elico-Corp/odoo_OCB,ygol/odoo,hip-odoo/odoo,laslabs/odoo,hip-odoo/odoo