Merge branch 'MDL-59490' of https://github.com/spvickers/moodle