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