Merge branch 'MDL-68239' of https://github.com/NinaHerrmann/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 08:17:44 +0000 (10:17 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 08:17:44 +0000 (10:17 +0200)

Trivial merge