Fix regression in merge that broke #1654
Fix regression in merge that broke #1654

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