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