Fixed issue #07688: Script errors
Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05