Merge branch '2.4' into 3.0

Conflicts:
	lib/Cake/Cache/Cache.php
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Configure/PhpReader.php
	lib/Cake/Console/Command/ServerShell.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Console/ConsoleErrorHandler.php
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
	lib/Cake/Controller/Component/AuthComponent.php
	lib/Cake/Core/Configure.php
	lib/Cake/Core/Plugin.php
	lib/Cake/Error/exceptions.php
	lib/Cake/I18n/I18n.php
	lib/Cake/Log/LogEngineCollection.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Datasource/Session.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/Network/Http/HttpSocketResponse.php
	lib/Cake/Routing/Route/RedirectRoute.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Controller/ComponentTest.php
	lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
	lib/Cake/Test/Case/Controller/ControllerTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/TestCase/Network/Email/EmailTest.php
	lib/Cake/TestSuite/ControllerTestCase.php
	lib/Cake/Utility/Debugger.php
	lib/Cake/Utility/Number.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Security.php
	lib/Cake/Utility/Time.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Errors/missing_plugin.ctp
	lib/Cake/View/Helper/MootoolsEngineHelper.php
	lib/Cake/View/Helper/PaginatorHelper.php