Merge branch 'master' into 2.4
Merge branch '2.4' into 2.5

Conflicts:
	lib/Cake/VERSION.txt
Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert()