Updated to CakePHP 2.5.4