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