Git merges in Moodle 3.5.x by AMOS bot

commit a1d6fd2a13c2c4dbda18118962723a77d397f582
Author: AMOS bot <amos@moodle.org>
Date:   Sat, 12 Dec 2020 08:07:39 +0800
Tag:    v3.5.16

Merge branch 'MOODLE_35_STABLE' into install_35_STABLE


commit 2e9bc584755ad3c0656dad53e51c1f3e46ed02ed
Author: AMOS bot <amos@moodle.org>
Date:   Wed, 10 Apr 2019 08:12:29 +0800
Tag:    v3.5.6

Merge branch 'MOODLE_35_STABLE' into install_35_STABLE