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