Merge branch 'MDL-65941-310' of https://github.com/snake/moodle into MOODLE_310_STABLE