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