Merge branch 'MDL-74816-311' of https://github.com/dpalou/moodle into MOODLE_311_STABLE