Merge branch 'MDL-70558' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 16:06:30 +0000 (17:06 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 16:06:30 +0000 (17:06 +0100)

Trivial merge