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