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