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