Revert aae86c849c1970762bbf253bc1e1e3494f44eaf6 as I don't understand it and it fails one test
useful output when test fails
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/Config.php