Merge branch 'MDL-70342-310' of git://github.com/abias/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 14:29:18 +0000 (15:29 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 14:29:18 +0000 (15:29 +0100)

Trivial merge