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