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

Trivial merge