Merge branch '2.4' into 3.0

Conflicts:
	app/webroot/index.php
	lib/Cake/Console/Command/Task/ExtractTask.php
	lib/Cake/Core/App.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Test/Case/Core/ObjectTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Fixture/ArticleFixture.php
	lib/Cake/Test/Fixture/ArticlesTagFixture.php
	lib/Cake/Test/Fixture/AuthorFixture.php
	lib/Cake/Test/Fixture/CakeSessionFixture.php
	lib/Cake/Test/Fixture/PostFixture.php
	lib/Cake/Test/Fixture/TagFixture.php
	lib/Cake/Test/TestCase/Network/ResponseTest.php
	lib/Cake/Test/TestCase/TestSuite/ControllerTestCaseTest.php