Merge in official CakePHP upstream changes

Merge in official CakePHP upstream changes with my repo so I can mess with latest version stuff if I want.