See https://github.com/cakephp/cakephp/pull/1234