Merge branch 'master' into 2.5

Conflicts:
	en/core-libraries/caching.rst
	en/core-libraries/components/cookie.rst
	en/core-utility-libraries/file-folder.rst
	en/core-utility-libraries/hash.rst
	en/development/sessions.rst