Merge branch 'MDL-69156_310' of https://github.com/ffhs/moodle into MOODLE_310_STABLE