Merging fixes to trunk
Merging fixes to trunk

Revision: [1788]
Added quick bug fix found after release

git-svn-id: e770600730d2d448a717592c3bff6d2b8d474ab5@1789 3807eeeb-6ff5-0310-8944-8be069107fe0

berrygoudswaard/cakephp,burriko/cakephp,dakota/cakephp,burriko/cakephp,akintoey/cakephp,et304383/passbolt_api,michaelze/cakephp,jerems02/cakephp,ADmad/cakephp,kumamidori/cakephp,yinhe007/cakephp,tenkoma/cakephp,jeffblack360/cakephp,cakephp-fr/cakephp,CakeDC/cakephp,eryw/cakephp,tgr0ss/cakephp,et304383/passbolt_api,jerems02/cakephp,eboominathan/cakephp,HavokInspiration/cakephp,erikfig/cakephp,ionas/cakephp,tisu2tisu/cakephp,michaelze/cakephp,adopico/cakephp,jjj117/cakephp,mvdriel/cakephp,dakota/cakephp,ADmad/cakephp,bravo-kernel/cakephp,ndm2/cakephp,Phillaf/cakephp,justinyost/cakephp,Balachan27/cakephp,et304383/passbolt_api,eboominathan/cakephp,garethellis36/cakephp,ADmad/cakephp,petteyg/cakephp,cakephp/cakephp,davidyell/cakephp,ionas/cakephp,adopico/cakephp,adopico/cakephp,ionas/cakephp,tgr0ss/cakephp,cakephp/cakephp,mvdriel/cakephp,et304383/passbolt_api,khoimt/cakephp-study,jerems02/cakephp,mvdriel/cakephp,thinkingmedia/cakephp,HavokInspiration/cakephp,tisu2tisu/cakephp,eryw/cakephp,dakota/cakephp,cakephp/cakephp,nrother/cakephp,web-player/cakephp,CVO-Technologies/cakephp,thinkingmedia/cakephp,web-player/cakephp,bravo-kernel/cakephp,khoimt/cakephp-study,cakephp-fr/cakephp,pbaire/cakephp,tenkoma/cakephp,kumamidori/cakephp,petteyg/cakephp,petteyg/cakephp,elboletaire/cakephp,garethellis36/cakephp,mvdriel/cakephp,CakeDC/cakephp,elboletaire/cakephp,akintoey/cakephp,dkarvounaris/cakephp,nrother/cakephp,erikfig/cakephp,eboominathan/cakephp,gmponos/cakephp,cakephp-fr/cakephp,CakeDC/cakephp,garethellis36/cakephp,jjj117/cakephp,thinkingmedia/cakephp,jeffblack360/cakephp,CVO-Technologies/cakephp,dkarvounaris/cakephp,ndm2/cakephp,tisu2tisu/cakephp,ndm2/cakephp,timhoeppner/cakephp,tenkoma/cakephp,jjj117/cakephp,dkarvounaris/cakephp,Balachan27/cakephp,burriko/cakephp,gmponos/cakephp,jeffblack360/cakephp,HavokInspiration/cakephp,nrother/cakephp,petteyg/cakephp,Balachan27/cakephp,dakota/cakephp,berrygoudswaard/cakephp,akintoey/cakephp,michaelze/cakephp,ndm2/cakephp,cakephp/cakephp,et304383/passbolt_api,eryw/cakephp,CakeDC/cakephp,pbaire/cakephp,Phillaf/cakephp,yinhe007/cakephp,justinyost/cakephp,Phillaf/cakephp,CVO-Technologies/cakephp,garethellis36/cakephp,erikfig/cakephp,ADmad/cakephp,web-player/cakephp,kumamidori/cakephp,elboletaire/cakephp,pbaire/cakephp,bravo-kernel/cakephp,gmponos/cakephp,timhoeppner/cakephp,timhoeppner/cakephp,justinyost/cakephp,davidyell/cakephp,berrygoudswaard/cakephp,khoimt/cakephp-study,tgr0ss/cakephp,tenkoma/cakephp,davidyell/cakephp,yinhe007/cakephp