Git merges in Moodle 3.11.4 by abgreeve

commit 5f26d8c3319cc7f13a55ac5891f51dcd2634b53f
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 01 Oct 2021 11:24:46 +0800
Tag:    v3.11.4

Merge branch 'MDL-69682-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE


commit 250524cf5b2b1a26f37d6177640c740f11ef336f
Author: abgreeve <adrian@moodle.com>
Date:   Thu, 30 Sep 2021 10:03:27 +0800
Tag:    v3.11.4

Merge branch 'MDL-72275-311-2' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE