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