Git merges in Moodle 3.11.2 by Eloy Lafuente (stronk7)

commit 0443be1bca617f92f9650a287c8a7ad8a75e36e9
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 15 Jul 2021 06:34:42 +0800
Tag:    v3.11.2

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


commit c2dd676a4eb3bb91c3b832251799d62aa8f60465
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Jul 2021 19:59:58 +0800
Tag:    v3.11.2

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


commit 13a902faeaa8be88481d2934ab2eb631c9e3312e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 14 Jul 2021 02:38:10 +0800
Tag:    v3.11.2

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