Merge origin/master

Conflicts:
	model/implementation/Database.php