Merge branch 'MDL-74570-fix' of https://github.com/sarjona/moodle