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