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

Trivial merge