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