Merge branch 'MDL-70386-310' of git://github.com/bmbrands/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2020 17:22:00 +0000 (18:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Dec 2020 17:22:00 +0000 (18:22 +0100)

Trivial merge