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