Git merges in Moodle 3.9.7 by Sara Arjona

commit ae221af1214609e32aec22a47c47b180d7a847b5
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 07 May 2021 00:42:41 +0800
Tag:    v3.9.7

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

commit b3a66b14843b3812cb945cad3481bf21d69b93ba
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 23:58:40 +0800
Tag:    v3.9.7

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

commit 54da1506a1cdce854ab43a152d8bda76536e8939
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 23:11:45 +0800
Tag:    v3.9.7

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

commit 818182879a3848b13dc27df84be2a7b8ce18871d
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 19:16:20 +0800
Tag:    v3.9.7

Merge branch 'MDL-70110-39' of https://github.com/septatrix/moodle into MOODLE_39_STABLE

commit bc47266a65cbc3f20cdfcf62a96e598a6e6a8a69
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 14:05:26 +0800
Tag:    v3.9.7

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

commit 16dff14e56325ff7d0bd01c4a67423077e227eb9
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 05 May 2021 18:18:03 +0800
Tag:    v3.9.7

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

commit c0d26fff0dee33e599283a929911decba19b0995
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 05 May 2021 18:14:23 +0800
Tag:    v3.9.7

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

commit b6d65c77cf0b6dbcbfc27e7f373622ef45c835f4
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 04 May 2021 23:10:55 +0800
Tag:    v3.9.7

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

commit 24c44b38beafa060306fa8e2548a6c69a5b03e93
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 04 May 2021 19:27:52 +0800
Tag:    v3.9.7

Merge branch 'install_39_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_39_STABLE

commit b7fb146ccac597b5234b2c3db8f03ec9329ef659
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 29 Apr 2021 23:50:06 +0800
Tag:    v3.9.7

Merge branch 'MDL-60331-39_take3' of git://github.com/lucaboesch/moodle into MOODLE_39_STABLE

commit c14603ecd1ab4475aa1c12d0f9f59b07e72cce92
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 29 Apr 2021 15:21:58 +0800
Tag:    v3.9.7

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

commit a6c9132e7333ce6b5797dbf3b2a5163fe0bfac72
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 28 Apr 2021 19:06:30 +0800
Tag:    v3.9.7

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

commit 323276969f56ab5b32622351a268a512397e9ea2
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 28 Apr 2021 18:58:35 +0800
Tag:    v3.9.7

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

commit 18a99edcb99484087666aa348254d89611682139
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 28 Apr 2021 18:31:13 +0800
Tag:    v3.9.7

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

commit c4dad5b5e6bc896351cde337ecca4f0272ace599
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 28 Apr 2021 15:17:46 +0800
Tag:    v3.9.7

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

commit eece2df651d8d6635201fb3db5e42c411191aa6b
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 26 Apr 2021 21:18:17 +0800
Tag:    v3.9.7

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

commit 61ef211525a767d44b9d4cb8c69c28fba95d3771
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 26 Apr 2021 18:35:56 +0800
Tag:    v3.9.7

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

commit 3f5477f8a051eb3c95bf44eba497ae827a5716c3
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 22 Apr 2021 19:56:55 +0800
Tag:    v3.9.7

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

commit 2166e3e681822c5d206678c8dc131a6fe761accf
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 22 Apr 2021 19:16:44 +0800
Tag:    v3.9.7

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

commit 7ccf8f2fe428cd333d0445519c2c0622b6ec9de6
Author: Sara Arjona <sara@moodle.com>
Date:   Wed, 21 Apr 2021 23:15:23 +0800
Tag:    v3.9.7

Merge branch 'MDL-64336-m39' of https://github.com/NeillM/moodle into MOODLE_39_STABLE

commit 0997a89e3936dabb430f774777ceb26ab7e18c3f
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 20 Apr 2021 23:45:12 +0800
Tag:    v3.9.7

Merge branch 'MDL-62244_39_label_view' of https://github.com/sheesania/moodle into MOODLE_39_STABLE

commit cf3215cff4e754d068362cebd2f8542d35d5ca4a
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 20 Apr 2021 21:51:16 +0800
Tag:    v3.9.7

Merge branch 'install_39_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_39_STABLE

commit 138e5b9996276b9177d883ef2305087d035e1566
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 19 Apr 2021 16:18:46 +0800
Tag:    v3.9.7

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

commit a5d64155ad28699fa19e95cc549d055be8aa7fa7
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 19 Apr 2021 15:49:29 +0800
Tag:    v3.9.7

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

commit e511a7fdc438a91bfa68b0d6e8f1b04593391cb2
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 19 Apr 2021 14:53:51 +0800
Tag:    v3.9.7

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

commit d4d2ef9119b7452b12e8e78ef4d276c095b4554e
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 16 Apr 2021 23:03:30 +0800
Tag:    v3.9.7

Merge branch 'install_39_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_39_STABLE

commit 1b8ced636ccecc060fea7a84598518787a085bb8
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 12 Apr 2021 23:24:52 +0800
Tag:    v3.9.7

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

commit 2c73fbfc3d0d59ff8533787d4368622a9ef4ef2b
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 12 Apr 2021 22:40:25 +0800
Tag:    v3.9.7

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

commit 5e3c934691dbffe34c72ad5ab28f5df41670e731
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 12 Apr 2021 22:01:49 +0800
Tag:    v3.9.7

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

commit df3efafbcff410f913fbf2b6f03121ad8b7310c8
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 12 Apr 2021 18:41:24 +0800
Tag:    v3.9.7

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