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