Merge branch 'MDL-68250-master' of git://github.com/bmbrands/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 08:31:39 +0000 (10:31 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 08:31:39 +0000 (10:31 +0200)

Trivial merge