Merge branch 'MDL-77077-401' of https://github.com/snake/moodle into MOODLE_401_STABLE