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

commit e1c1dfc748e1e27bf8dce274484d1d06073111ed
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 05 May 2021 17:57:44 +0800
Tag:    v3.5.18

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


commit ab625318570781ea9fd904ed959c30d161068726
Author: Víctor Déniz <victor@moodle.com>
Date:   Fri, 30 Apr 2021 19:54:16 +0800
Tag:    v3.5.18

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


commit 290e0f7de50bd414d31da505357a5c6db91142aa
Author: Víctor Déniz <victor@moodle.com>
Date:   Wed, 24 Mar 2021 22:20:47 +0800
Tag:    v3.5.18

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