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