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