Merge branch 'MDL-74280' of https://github.com/paulholden/moodle