Merge branch 'MDL-70740-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Mon, 1 Feb 2021 10:25:04 +0000 (11:25 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 1 Feb 2021 10:25:04 +0000 (11:25 +0100)

Trivial merge