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