https://github.com/cakephp/cakephp/pull/1491/files#r5652194 & CS