Upgrading to Cake 2.4
merged to 2.4