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