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