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