[REL] saas-5
[FIX] website_sale: remove invalid (and stupid) function field
[MERGE] forward port of branch saas-5 up to revid 960b866
Merge branch 'master' of https://github.com/odoo/odoo into master-win32