Merge branch 'MDL-67713-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Mon, 4 May 2020 17:30:45 +0000 (19:30 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 4 May 2020 17:30:45 +0000 (19:30 +0200)

Trivial merge