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