Merge branch 'MDL-69107-master-2' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Fri, 18 Dec 2020 14:22:09 +0000 (15:22 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 18 Dec 2020 14:22:09 +0000 (15:22 +0100)

Trivial merge