merging fixes from [3102] into 1.1
merging fixes from [3102] into 1.1

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

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