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

Trivial merge