Commit changes I forgot about when merging master -> 3.2
Commit changes I forgot about when merging master -> 3.2

thinkingmedia/cakephp,garethellis36/cakephp,dakota/cakephp,davidyell/cakephp,ionas/cakephp,ndm2/cakephp,jeffblack360/cakephp,bravo-kernel/cakephp,tgr0ss/cakephp,michaelze/cakephp,nrother/cakephp,CakeDC/cakephp,HavokInspiration/cakephp,mvdriel/cakephp,ADmad/cakephp,jeffblack360/cakephp,dakota/cakephp,ADmad/cakephp,tenkoma/cakephp,mvdriel/cakephp,justinyost/cakephp,CVO-Technologies/cakephp,ndm2/cakephp,elboletaire/cakephp,ndm2/cakephp,tenkoma/cakephp,garethellis36/cakephp,cakephp-fr/cakephp,berrygoudswaard/cakephp,elboletaire/cakephp,tgr0ss/cakephp,dakota/cakephp,gmponos/cakephp,HavokInspiration/cakephp,Phillaf/cakephp,justinyost/cakephp,dakota/cakephp,cakephp/cakephp,petteyg/cakephp,nrother/cakephp,gmponos/cakephp,ndm2/cakephp,berrygoudswaard/cakephp,cakephp/cakephp,bravo-kernel/cakephp,michaelze/cakephp,jeffblack360/cakephp,cakephp-fr/cakephp,cakephp-fr/cakephp,cakephp/cakephp,ADmad/cakephp,thinkingmedia/cakephp,petteyg/cakephp,HavokInspiration/cakephp,justinyost/cakephp,nrother/cakephp,Phillaf/cakephp,tgr0ss/cakephp,ionas/cakephp,mvdriel/cakephp,CakeDC/cakephp,davidyell/cakephp,michaelze/cakephp,cakephp/cakephp,gmponos/cakephp,mvdriel/cakephp,Phillaf/cakephp,CVO-Technologies/cakephp,davidyell/cakephp,thinkingmedia/cakephp,elboletaire/cakephp,CVO-Technologies/cakephp,bravo-kernel/cakephp,tenkoma/cakephp,petteyg/cakephp,ionas/cakephp,berrygoudswaard/cakephp,garethellis36/cakephp,tenkoma/cakephp,CakeDC/cakephp,CakeDC/cakephp,petteyg/cakephp,ADmad/cakephp,garethellis36/cakephp