Merge branch 'MOODLE_310_STABLE' into install_310_STABLE
authorAMOS bot <amos@moodle.org>
Sat, 12 Dec 2020 00:07:27 +0000 (00:07 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 12 Dec 2020 00:07:27 +0000 (00:07 +0000)

Trivial merge