Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_2...