Merge branch 'master' into master-sc-test

Conflicts:
	data/source/Database.php