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