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