CONTRIB-4592

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
Merge branch 'MOODLE_25_STABLE' into MOODLE_25_BFC