Git merges in Moodle 3.10.4 by abgreeve

commit 5ed11926a677d9f35bf6e23367af1fecb36f3b6b
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 07 May 2021 11:16:46 +0800
Tag:    v3.10.4

Merge branch 'MDL-68747-310' of https://github.com/dcai/moodle into MOODLE_310_STABLE


commit c6ec73b12e0f07b4c10902754fd1b93a3679294a
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 07 May 2021 10:22:28 +0800
Tag:    v3.10.4

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


commit 0094d8e66e1c2398e19487217409e657eccddadc
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 06 May 2021 10:05:02 +0800
Tag:    v3.10.4

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


commit 4f46b8449b566621ec0fd51e733e10141266bc76
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 04 May 2021 15:47:33 +0800
Tag:    v3.10.4

Merge branch 'MDL-66673-MOODLE_310_STABLE' of https://github.com/ScottVerbeek/moodle into MOODLE_310_STABLE


commit 6dc0b43072ba8104c386970e930799e1ec1a16ff
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Mon, 03 May 2021 16:04:36 +0800
Tag:    v3.10.4

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


commit dc783d3d5e031e3123d041bd21a7a7556303a3cf
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Fri, 30 Apr 2021 11:19:46 +0800
Tag:    v3.10.4

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


commit d426ee3cccad4a1a29422267667119eec4531c12
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 27 Apr 2021 09:35:52 +0800
Tag:    v3.10.4

Merge branch 'MDL-71329-310' of https://github.com/Chocolate-lightning/moodle into MOODLE_310_STABLE