Git merges in Moodle 3.9.8 by Víctor Déniz

commit b751583087c5cea6f32527818d372233466ed37c
Author: Víctor Déniz <victor@moodle.com>
Date:   Thu, 17 Jun 2021 21:55:04 +0800
Tag:    v3.9.8

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


commit cf6aeae427f088f17d9a4e4754b5952812e991b8
Author: Víctor Déniz <victor@moodle.com>
Date:   Tue, 11 May 2021 06:43:30 +0800
Tag:    v3.9.8

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