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