Merge branch 'MDL-70578-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 11:58:20 +0000 (12:58 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 11:58:20 +0000 (12:58 +0100)

Trivial merge