Merge branch 'MDL-71107-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 10:41:03 +0000 (12:41 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 10:41:03 +0000 (12:41 +0200)

Trivial merge