Merge branch 'MDL-70006' of git://github.com/danmarsden/moodle
authorSara Arjona <sara@moodle.com>
Tue, 24 Aug 2021 11:13:03 +0000 (13:13 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 24 Aug 2021 11:13:03 +0000 (13:13 +0200)

Trivial merge