Merge branch '2.5' into 3.0

Conflicts:
	en/appendices.rst
	en/controllers/components.rst
	en/core-libraries/caching.rst
	en/core-libraries/collections.rst
	en/core-libraries/events.rst
	en/core-libraries/global-constants-and-functions.rst
	en/core-libraries/logging.rst
	en/core-libraries/toc-utilities.rst
	en/core-utility-libraries/email.rst
	en/core-utility-libraries/httpsocket.rst
	en/core-utility-libraries/sanitize.rst
	en/core-utility-libraries/security.rst
	en/development/configuration.rst
	en/development/exceptions.rst
	en/development/routing.rst
	en/development/testing.rst
	en/views/helpers.rst