Git merges in Moodle 3.9.13 by Jake Dallimore

commit 7c1a3ed76f81014228194733739dd201022f9104
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 10 Mar 2022 15:35:26 +0800
Tag:    v3.9.13

Merge branch 'MDL-73899-39' of https://github.com/andrewnicols/moodle into MOODLE_39_STABLE