Merge branch 'MDL-52523' of git://github.com/timhunt/moodle