Merge branch 'master' into 3.0-merge

Conflicts:
	en/appendices/2-5-migration-guide.rst
	en/controllers/request-response.rst
	en/core-libraries/caching.rst
	en/core-libraries/internationalization-and-localization.rst
	en/core-libraries/logging.rst
	en/installation/advanced-installation.rst
	en/views.rst
	fr/appendices/2-5-migration-guide.rst
	fr/appendices/glossary.rst
	fr/controllers/request-response.rst
	fr/core-libraries/caching.rst
	fr/core-libraries/logging.rst
	fr/models/data-validation.rst
	fr/plugins.rst