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