Merge branch 'MDL-68189' of https://github.com/NeillM/moodle