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