mod_survey: merge changes from 0.11.x into mw-filestore branch