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