Merge branch 'MDL-54606' of https://github.com/mr-russ/moodle