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