Merge branch 'master-MDL-70362' of https://github.com/golenkovm/moodle
authorSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 11:36:24 +0000 (12:36 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 11:36:24 +0000 (12:36 +0100)

Trivial merge