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