Merge branch 'MDL-70037' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Tue, 1 Dec 2020 07:00:28 +0000 (08:00 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 1 Dec 2020 07:00:28 +0000 (08:00 +0100)

Trivial merge