Merge branch 'MDL-52346' of git://github.com/mr-russ/moodle