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