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