Merge branch 'MOODLE_25_STABLE' into DEMATIC_2.5

most recent updates