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