First
Merge remote-tracking branch 'origin/master'

Conflicts:
	include/core/database.php