Merge branch 'MDL-30271-switch-role-workshop' of git://github.com/mudrd8mz/moodle