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