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