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