Git merges in Moodle 3.10.5 by Jun Pataleta

commit 39a8d3ada6a7d372872b4e9bb2e50b660f959f6d
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 16:36:18 +0800
Tag:    v3.10.5

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

commit 7bcaff1f45486fe6f0b13b1d174802123aa812ff
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 12:14:28 +0800
Tag:    v3.10.5

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

commit 00738cf40f1420af5045a313224466f14e57c629
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 21 May 2021 08:57:33 +0800
Tag:    v3.10.5

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

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

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