Merge remote-tracking branch 'cakephp/2.5' into 2.5-AssetDispatcher-404
Merge branch '2.5-AssetDispatcher-404' of https://github.com/zoghal/cakephp into 2.5-AssetDispatcher-404