Merge branch '2.5' into 3.0

Conflicts:
	Cake/Controller/Controller.php
	Cake/Error/ExceptionRenderer.php
	Cake/Routing/Dispatcher.php
	Cake/Test/TestCase/Console/Command/Task/FixtureTaskTest.php
	Cake/Test/TestCase/Controller/Component/AuthComponentTest.php
	Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	Cake/Test/TestCase/Error/ExceptionRendererTest.php
	Cake/Test/TestCase/Model/models.php
	app/Config/core.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Cache/CacheTest.php
	lib/Cake/Test/Case/Controller/ControllerTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php