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