Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 May 2020 13:47:44 +0000 (15:47 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 25 May 2020 13:47:44 +0000 (15:47 +0200)

Trivial merge