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

commit 42fa42b715437182261314a52cd22742682e823f
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 05 May 2021 17:52:21 +0800
Tag:    v3.8.9

Merge branch 'MDL-71460-38' of git://github.com/peterRd/moodle into MOODLE_38_STABLE

commit 09756b8b414d2caa37c60df7ec4bad38ff63faac
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 24 Mar 2021 22:20:52 +0800
Tag:    v3.8.9

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