Merge branch 'MDL-70422' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:42:46 +0000 (16:42 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:42:46 +0000 (16:42 +0100)

Trivial merge