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