Merge branch 'MDL-78066-402' of https://github.com/snake/moodle into MOODLE_402_STABLE