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