Merge branch 'MDL-41693-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE