Port fix from 2.2.x branch for #838
Port fix from 2.2.x branch for #838

blaXXabla/projet_test_symphony,BloodBrother/symphony-2,michael-e/symphony-2,jdsimcoe/symphony-boilerplate,ljonka/symphony-2,jurajkapsz/symphony-2,brendo/symphony-2,mazedigital/jcilearn,roshinebagha/Symphony-Test,wastemobile/Symphony2.3.6,allen/auth.getsymphony.com,alexnantel88/symphony-2,bauhouse/Piano-Sonata,ljonka/symphony-2,twiro/symphony-2,ayellowraven/projectplaten,michael-e/symphony-2,wastemobile/Symphony2.3.6,jensscherbl/symphony,brendo/symphony-2,jensscherbl/symphony,rzantolas/Symphony-Test,jonmifsud/symphony-2,avanteweb/symphony-2,symphonycms/sym-getsymphony,blaXXabla/projet_test_symphony,symphonycms/symphony-2,allen/auth.getsymphony.com,bauhouse/sym-todo-list,twiro/symphony-2,BloodBrother/symphony-2,rzantolas/Symphony-Test,mazedigital/jcilearn,johnpuddephatt/symphony-2,jonmifsud/symphony-2,jdsimcoe/symphony-boilerplate,ayellowraven/projectplaten,astudio/remixhair,jdsimcoe/symphony-boilerplate,roshinebagha/Symphony-Test,DeuxHuitHuit/symphony-2,alexnantel88/symphony-2,symphonycms/sym-getsymphony,thebestsophist/personal-health-diary,jurajkapsz/symphony-2,bauhouse/sym-todo-list,bauhouse/sym-pears,bauhouse/sym-pears,astudio/remixhair,mazedigital/jcilearn,symphonycms/symphony-2,DavidForster/symphony-2,avanteweb/symphony-2,jdsimcoe/symphony-boilerplate,bauhouse/Piano-Sonata,DeuxHuitHuit/symphony-2,DavidForster/symphony-2,NikoMostWanted/symphony-2,thebestsophist/personal-health-diary,johnpuddephatt/symphony-2,NikoMostWanted/symphony-2