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