Merge branch 'MDL-70298-master' of git://github.com/ilyatregubov/moodle
authorSara Arjona <sara@moodle.com>
Tue, 12 Jan 2021 14:58:34 +0000 (15:58 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 12 Jan 2021 14:58:34 +0000 (15:58 +0100)

Trivial merge