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