Merge branch 'MDL-68716' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 15:24:33 +0000 (17:24 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 15:24:33 +0000 (17:24 +0200)

Trivial merge