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