Git merges in Moodle 3.11.1 by Jun Pataleta

commit edd769831c3e3494005087329b8ef7d5a80c3f1e
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 16:36:07 +0800
Tag:    v3.11.1

Merge branch 'MDL-71919-311-fix' of https://github.com/cescobedo/moodle into MOODLE_311_STABLE

commit a405f1c94713531c495b4f06caee309555f6db89
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 12:14:20 +0800
Tag:    v3.11.1

Merge branch 'MDL-70594_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE

commit 44257ec096ec0eb3804fda296f64ca68456a422e
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 21 May 2021 08:57:20 +0800
Tag:    v3.11.1

Merge branch 'MDL-60431_311' of https://github.com/jonof/moodle into MOODLE_311_STABLE

commit bb662a7dc4366c57442ce38bf410f6c03a3da290
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 20 May 2021 12:29:58 +0800
Tag:    v3.11.1

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