Merge branch 'MDL-71127' of git://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 10:58:15 +0000 (12:58 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 10:58:15 +0000 (12:58 +0200)

Trivial merge