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