Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/account_analytic_analysis/account_analytic_analysis_view.xml
Simple merge

diff --cc addons/mail/static/src/js/mail.js
Simple merge

diff --cc addons/mail/static/src/xml/mail.xml
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge