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