Update to CakePHP 2.3.6