Merge branch 'master-MDL-69773_v2' of https://github.com/golenkovm/moodle
authorSara Arjona <sara@moodle.com>
Tue, 24 Nov 2020 16:24:44 +0000 (17:24 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 24 Nov 2020 16:24:44 +0000 (17:24 +0100)

Trivial merge