Merge branch 'hotfix/3.1.3'
Correctly handle special characters in page aliases (see #6232)
Merge branch 'hotfix/3.1.4' into develop

Conflicts:
	system/docs/CHANGELOG.md