Merge branch 'MDL-65495-master-courseid' of git://github.com/mudrd8mz/moodle