Merge branch 'm26_MDL-46197' of https://github.com/totara/moodle into MOODLE_26_STABLE