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