Merge branch 'MDL-70397-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Mon, 14 Dec 2020 16:11:46 +0000 (17:11 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 14 Dec 2020 16:11:46 +0000 (17:11 +0100)

Trivial merge