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