Merging fix from [3912]
Merging fix from [3912]

git-svn-id: 5860920b332e8b1c20d5ac1ddb0cfb1512ef151a@3913 3807eeeb-6ff5-0310-8944-8be069107fe0

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