Now works with CakePHP 2.2 (possibly 2.x)