Merge branch 'MDL-68294-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 10:49:32 +0000 (12:49 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 10:49:32 +0000 (12:49 +0200)

Trivial merge