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