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