Changed error message
Merge pull request #4507 from rochamarcelo/patch-2

Changed error message
Fixed overwriting of files when Folder::SKIP is set
hardcode a relative path to core installed via composer

 as book suggests
Merge pull request #4540 from ptica/master

hardcode a relative path to core installed via composer
Removed use of @version annotation
Removed use of @modifiedby annotation
Removed use of @lastmodified annotation
Merge pull request #4561 from ravage84/2.0-remove-old-annotations

2.0 remove old annotations
Add tests for #4521 and reformat code.

Add a regression test for #4521 as the original author didn't have one.
Reformat a long line since I was nearby already.

Closes #4521
Merge branch 'folder_overwrite_fix'

Merge pull request #4521 into master.
Use (int) cast instead of intval() function for performance reasons and to unify it.
Take care of more int casts.
Manually correct remaining casts.
Merge pull request #4570 from cakephp/master-casting

Use (int) instead of intval() for performance reasons and to unify it.
Fix PHP flaw around intval with custom base.
Clarify octal input instead.
Wording.
Merge pull request #4572 from cakephp/master-fix-intval

PHP flaw around intval with custom base.