Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle