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