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