Merge branch '10.5-fix'
Bump patch version
Merge branch 'master' into wip

Conflicts:
	app/helpers/site_helper.php
Bump minor to 2
Update changelog