Merge branch 'MDL-71991' of https://github.com/timhunt/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:09:30 +0000 (16:09 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:09:30 +0000 (16:09 +0200)

Trivial merge