Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle