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