Merge branch 'MDL-27550-workshop-feedback' of git://github.com/mudrd8mz/moodle