Git merges in Moodle 3.10.4 by Andrew Nicols

commit c05862dc9af0b8d03ae986303baddd3ec0eff5b5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 29 Apr 2021 09:41:59 +0800
Tag:    v3.10.4

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

commit 6679c41c8901855c2b16db156d02bfa07e301b5a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:50:19 +0800
Tag:    v3.10.4

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

commit 17625bd5b25ac11fabaf65ab4be11a62350d763c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:26:41 +0800
Tag:    v3.10.4

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

commit 475ea093b417591c6432c75efb833a98baa58504
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:15:54 +0800
Tag:    v3.10.4

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

commit 298a70eba18c19d2c74d0f09c3ba9cd53914abfd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 23 Apr 2021 11:53:24 +0800
Tag:    v3.10.4

Merge branch 'MOODLE_310_STABLE-MDL-71376' of https://github.com/rjnl/moodle into MOODLE_310_STABLE

commit 0e301e88a5252b31ca02e5c197ad604569a74ffb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 23 Apr 2021 11:39:04 +0800
Tag:    v3.10.4

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

commit 855e7e9ede63e20a8a8feae790fd86a1353644d7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 22 Apr 2021 10:07:57 +0800
Tag:    v3.10.4

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

commit bf4038a971ba34481900f935b2d9f47023874851
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Apr 2021 12:08:51 +0800
Tag:    v3.10.4

Merge branch 'MOODLE_310_MDL-71233' of https://github.com/golenkovm/moodle into MOODLE_310_STABLE

commit 10c4a677600c71a2dbe967be80a8a4216db3cbd8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Apr 2021 11:54:13 +0800
Tag:    v3.10.4

Merge branch 'MDL-60490-missing_close_div-310' of https://github.com/leonstr/moodle into MOODLE_310_STABLE

commit def3f4a074d3f8fb52c4e23ae363aa77c4d7e5e6
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Apr 2021 11:27:06 +0800
Tag:    v3.10.4

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

commit 0c611e0a13cafe146e31d1d71e2bf11456589a98
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Apr 2021 12:11:21 +0800
Tag:    v3.10.4

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

commit 838190a43a40eec5503af0597830f00d2e07dee1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Mar 2021 11:54:27 +0800
Tag:    v3.10.4

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

commit d4de6e594d3a2675b33f6abb2a330d3e2ae9a1ee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 25 Mar 2021 08:07:41 +0800
Tag:    v3.10.4

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