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