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