Merge branch 'MDL-69228-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:05 +0000 (12:41 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:05 +0000 (12:41 +0200)

Trivial merge