Merge branch 'MDL-70034_master' of git://github.com/mdjnelson/moodle
authorSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:22 +0000 (15:19 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:22 +0000 (15:19 +0100)

Trivial merge