Rewrite to follow cakephp/app#154
Again Rewrite to follow cakephp/app#154
Merge pull request #1835 from cakephp/3.0-new-rewrites

3.0 new rewrites