Merge branch 'MDL-42790_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE