update after cakephp/cakephp#4526
Merge pull request #137 from antograssiot/master

3.0 update after cakephp/cakephp#4526