Conflicts:
	config/global.php
	core/CliMulti/RequestCommand.php
	core/Config.php
	core/Config/IniFileChain.php
	tests/PHPUnit/System/BlobReportLimitingTest.php
	tests/PHPUnit/TestingEnvironment.php
	tests/PHPUnit/Unit/Config/IniFileChainTest.php
	tests/PHPUnit/Unit/ConfigTest.php