Merge branch 'MDL-70621-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 08:02:45 +0000 (09:02 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 3 Feb 2021 08:02:45 +0000 (09:02 +0100)

Trivial merge