Dev Fixed some bugs reported by @seracom.
Merge branch '2.05' of https://github.com/LimeSurvey/LimeSurvey into 2.05