Merge branch 'MDL-45636-course_master' of https://github.com/eSrem/moodle