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