Merge branch '2.4' into 3.0

Conflicts:
	.travis.yml
	lib/Cake/Network/Request.php
	lib/Cake/Test/TestCase/Controller/Component/Auth/BasicAuthenticateTest.php
	lib/Cake/Test/TestCase/Controller/Component/Auth/DigestAuthenticateTest.php
	lib/Cake/Test/TestCase/Utility/TimeTest.php
	lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
	lib/Cake/Test/TestCase/View/Helper/TextHelperTest.php
	lib/Cake/Utility/Time.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/View/Helper/TimeHelper.php
	lib/Cake/bootstrap.php