Merge branch 'MDL-71971-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:16:07 +0000 (16:16 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:16:07 +0000 (16:16 +0200)

Trivial merge