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