Merge branch 'MDL-69525-master-1' of git://github.com/mihailges/moodle into master
authorSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 12:21:37 +0000 (14:21 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 12:21:37 +0000 (14:21 +0200)

Trivial merge