Merge branch 'MDL-71187-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Wed, 5 May 2021 10:13:59 +0000 (12:13 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 5 May 2021 10:13:59 +0000 (12:13 +0200)

Trivial merge