Fixed issue #7898: Can't delete a survey
Merge remote-tracking branch 'origin/2.05' into 2.05