Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle