Merge branch 'MDL-76170-400' of https://github.com/snake/moodle into MOODLE_400_STABLE