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