core_Setup.inc.php hotFix
Merge remote-tracking branch 'origin/RC2' into RC1

Conflicts:
	core/Setup.inc.php