Git merges in Moodle 3.9.7 by abgreeve

commit 849f392f3b54adebbe3c2ddbb3f2470cdb272230
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 07 May 2021 11:17:09 +0800
Tag:    v3.9.7

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


commit 711b1a5ae99dc8be1fbc1f919cf22b67520a23be
Author: abgreeve <adrian@moodle.com>
Date:   Fri, 07 May 2021 10:22:50 +0800
Tag:    v3.9.7

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


commit 799e988f809a1467b01f68c0f80e5419dc2a156c
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 06 May 2021 10:04:26 +0800
Tag:    v3.9.7

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


commit d848c604dda74cba2b4ccc3e9a3983a50e3c34cf
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Tue, 04 May 2021 15:47:08 +0800
Tag:    v3.9.7

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


commit 65fad5f93f78c8e32e704d8575dd4439d6e91dff
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Mon, 03 May 2021 16:04:05 +0800
Tag:    v3.9.7

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


commit ccb1a3b39f8384e96d789d7a604e8053b716325b
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Fri, 30 Apr 2021 11:20:17 +0800
Tag:    v3.9.7

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