Git merges in Moodle 3.5.18 by Eloy Lafuente (stronk7)

commit 7a4476b8349f3720df97dd86b95ed015f353ddcc
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 07 May 2021 22:54:37 +0800
Tag:    v3.5.18

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

commit 54f6d895a8838baef90e78c441743924422d98e8
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Mar 2021 07:13:18 +0800
Tag:    v3.5.18

Merge branch 'MDL-70726-3.5' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_35_STABLE