Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle