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