Merge branch 'BC-14'

Conflicts:
	index.php
Merge branch 'master' into dev

Conflicts:
	index.php