Merge branch 'MDL-70979' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 11:06:07 +0000 (13:06 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 11:06:07 +0000 (13:06 +0200)

Trivial merge