Merge branch '40903-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE