Merge branch 'MDL-42494-workshop-exception' of git://github.com/mudrd8mz/moodle