Merge branch 'MDL-65616' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Thu, 8 Apr 2021 15:45:41 +0000 (17:45 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 8 Apr 2021 15:45:41 +0000 (17:45 +0200)

Trivial merge