Git merges in Moodle 3.9.7 by Andrew Nicols

commit 3d92acac8a621b26083ca0088894a5c67f486c45
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 29 Apr 2021 09:42:14 +0800
Tag:    v3.9.7

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

commit 9c4204c96b547b501e70088bd49108b3418043a2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:50:33 +0800
Tag:    v3.9.7

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

commit c7e65064b1de91d182f4d76514f7b10be12fd0b8
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:33:54 +0800
Tag:    v3.9.7

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

commit 32702452e75b23dc06e463b0ddb6882b15233065
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 28 Apr 2021 10:16:02 +0800
Tag:    v3.9.7

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

commit 6d6a39e34d4840ef211fc1f8a132d7d8e9461469
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 23 Apr 2021 11:53:36 +0800
Tag:    v3.9.7

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

commit 1b169c82be0a9d391a6f7d4bee4b82e2eb529e83
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 23 Apr 2021 11:39:52 +0800
Tag:    v3.9.7

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

commit f33b8bb576ec8c3a1c02003da4b1a18f4dd40e38
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 22 Apr 2021 10:07:40 +0800
Tag:    v3.9.7

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

commit fdcc9383b107059faeb2b21b4d86582653321f90
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 16 Apr 2021 11:55:01 +0800
Tag:    v3.9.7

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

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

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

commit 83c3d047028ed8ab79f49ff3a42b45073836ad66
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Apr 2021 12:11:46 +0800
Tag:    v3.9.7

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

commit 3f0cc3d712dc0c32f67b3c709c59f61411e5798a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Mar 2021 11:54:53 +0800
Tag:    v3.9.7

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

commit 8c62673dc55e09bd78eb334dc8d6df7aac3e9c0b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 25 Mar 2021 08:07:54 +0800
Tag:    v3.9.7

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