Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle