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