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

Trivial merge