Merge branch 'MDL-69371' of git://github.com/stronk7/moodle