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