Fix issue #2681 (alternative to PR #2690)
[ci skip] Fix a changelog entry
Eh ... preg_replace() needs a replacement
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	system/core/Security.php