Merge branch 'MOODLE_310_STABLE-MDL-71376' of https://github.com/rjnl/moodle into...