Merge branch 'MDL-65451' of https://github.com/marinaglancy/moodle into master
authorSara Arjona <sara@moodle.com>
Wed, 7 Oct 2020 07:39:46 +0000 (09:39 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 7 Oct 2020 07:39:46 +0000 (09:39 +0200)

Trivial merge