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