Git merges in Moodle 3.5.18 by Sara Arjona

commit cd827ebe235ebe419e73ea5ce1b864d2debe624b
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 23:59:12 +0800
Tag:    v3.5.18

Merge branch 'MDL-71420_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE


commit b76287f8464a28a5f2a2efb16bd22e383d6a997d
Author: Sara Arjona <sara@moodle.com>
Date:   Thu, 06 May 2021 14:04:25 +0800
Tag:    v3.5.18

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


commit ee02ba0623805032d637721474a2499f37339018
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 12 Mar 2021 00:18:53 +0800
Tag:    v3.5.18

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