[FIX] https://github.com/odoo/odoo/issues/1122
Merge branch 'saas-5' of github.com:yelizariev/odoo into saas-5