Merge branch 'master' into hotfix/breadcrumbs-homelink

Conflicts:
	library/core/class.request.php
Merge branch 'master' into stage