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