Merge branch 'MDL-78962_402' of https://github.com/timhunt/moodle into MOODLE_402_STABLE