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