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