Merge branch 'MDL-63176' of https://github.com/spvickers/moodle