Merging fixes from [3908] for Ticket #1689
Merging fixes from [3908] for Ticket #1689

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

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