Merge branch 'MDL-70245-MOODLE_310_STABLE' of https://github.com/TomoTsuyuki/moodle...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jan 2021 22:49:47 +0000 (23:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jan 2021 22:49:47 +0000 (23:49 +0100)

Trivial merge