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