Git merges in Moodle 3.11.2 by Ilya Tregubov

commit ae77cfd5af50e0ef998166275199f1176ea969b2
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Wed, 28 Jul 2021 22:48:20 +0800
Tag:    v3.11.2

Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE

commit 6da13bc87a00a373517861ec03508016002ba044
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Wed, 28 Jul 2021 17:16:47 +0800
Tag:    v3.11.2

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

commit 3f9cc1fc760e7077a711ee4abe2ee6bf96f27762
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Tue, 27 Jul 2021 18:37:38 +0800
Tag:    v3.11.2

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

commit 0ca014907b95a16188ab66aaea06d12ec0058ec6
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Fri, 23 Jul 2021 17:30:59 +0800
Tag:    v3.11.2

Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE

commit d6bd634cc5d58693f116cbebc669dd127e715b2a
Author: Ilya Tregubov <ilya@moodle.com>
Date:   Mon, 19 Jul 2021 20:00:45 +0800
Tag:    v3.11.2

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