PR to mark's fork: https://github.com/markstory/cakephp/pull/7