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