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