dev: some more cleanup
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git