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