Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle