Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle