Merge branch 'MDL-76389' of https://github.com/stronk7/moodle