Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle