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