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