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