Merge branch 'MDL-69973' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Mon, 2 Nov 2020 14:44:41 +0000 (15:44 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 2 Nov 2020 14:44:41 +0000 (15:44 +0100)

Trivial merge