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