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