Merge branch 'MDL-38419' of https://github.com/moodlerooms/moodle