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