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