Merge branch 'MDL-70535' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 10:19:14 +0000 (11:19 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 10:19:14 +0000 (11:19 +0100)

Trivial merge