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