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