Merge branch '2.5' into 3.0

Conflicts:
	Cake/Network/Email/Email.php
	app/Config/bootstrap.php
	app/Config/core.php
	lib/Cake/Controller/Scaffold.php
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/StringTest.php
	lib/Cake/View/ScaffoldView.php