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