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