Git merges in Moodle 3.9.2 by Jake Dallimore

commit 457d2b5e2e8d60d17699acbeb03ca2f8752db315
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 02 Mar 2023 11:43:33 +0800
Tag:    v3.9.20

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


commit 6e5ae126af50ac3f351e9a2067f018a3b1edc9af
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 15 Jul 2020 10:29:28 +0800
Tag:    v3.9.2

Merge branch 'MDL-69206-39' of git://github.com/mihailges/moodle into MOODLE_39_STABLE