Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 16:48:01 +0000 (18:48 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 16:48:01 +0000 (18:48 +0200)

Trivial merge