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