WHAT: Updated for CakePHP 2.5.1