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