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