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