Merge remote-tracking branch 'odoo/master'

addons/base_gengo/doc/changelog.rst

addons/base_gengo/wizard/base_gengo_translations.py

addons/delivery/delivery.py

addons/delivery/delivery_view.xml

addons/website_forum/data/forum_data.xml

addons/website_forum/models/forum.py

addons/website_forum/views/forum.xml

addons/website_forum/views/website_forum.xml

addons/website_sale/controllers/main.py