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