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