Re-apply @nils-werner fixes
Re-apply @nils-werner fixes

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