Git merges in Moodle 3.9.8 by Sara Arjona

commit ae9fea0b47301699def4734ecd6e3fbc5fd39851
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 20 May 2021 17:09:10 +0800
Tag:    v3.9.8

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

commit 4799f8b7c49b08c4b0c39e2b596cd3a60640bd20
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 11 May 2021 18:42:35 +0800
Tag:    v3.9.8

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