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