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