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