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