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