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