Merge branch 'MDL-68253-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 11:54:34 +0000 (13:54 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 11:54:34 +0000 (13:54 +0200)

Trivial merge