BC-18
Merge branch 'BC-18' into dev
BC-19
Merge branch 'BC-19'

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