Backporting overwrite() from 3.0 to 2.6.
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite
Merge pull request #3412 from dereuromark/2.6-overwrite

Backporting overwrite() from 3.0 to 2.6.