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