Merging fix from [3228]
Merging fix from [3228]

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

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