Merge pull request #1 from moodle/MOODLE_25_STABLE

Moodle 25 stable