Correct argument. Should not have a default string.
Merge pull request #5474 from cakephp/master-testsuite

Correct argument. Should not have a default string.
Clarify question.

Fixes #1870
Update version number to 2.5.8
Merge branch 'master' into 2.6

Conflicts:
	lib/Cake/VERSION.txt