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