Pulling the latest changes from CakePHP