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