Git merges in Moodle 3.10.11 by Andrew Nicols

commit 7ef52704de4208fdec2e03f818830729c955846a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 31 Mar 2022 22:34:05 +0800
Tag:    v3.10.11

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