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