Merge branch 'MDL-70595-master' of git://github.com/mickhawkins/moodle
authorSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 14:01:29 +0000 (16:01 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 12 Apr 2021 14:01:29 +0000 (16:01 +0200)

Trivial merge