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