Merge branch 'MDL-70355-master' of git://github.com/lucaboesch/moodle
authorVíctor Déniz <victor@moodle.com>
Mon, 21 Dec 2020 23:20:14 +0000 (23:20 +0000)
committerVíctor Déniz <victor@moodle.com>
Mon, 21 Dec 2020 23:20:14 +0000 (23:20 +0000)

Trivial merge