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