Git merges in Moodle 3.11.3 by abgreeve

commit 439092427b36b2f9e7ab6772712aebc96be9395b
Author: abgreeve <adrian@moodle.com>
Date:   Wed, 04 Aug 2021 15:53:15 +0800
Tag:    v3.11.3

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


commit 0af232b4613d98a992ef44e5f6dd3208ffccdc52
Author: abgreeve <adrian@moodle.com>
Date:   Tue, 03 Aug 2021 10:26:49 +0800
Tag:    v3.11.3

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