Merge branch 'MDL-68320-master' of git://github.com/lameze/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 07:29:00 +0000 (09:29 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 07:29:00 +0000 (09:29 +0200)

Trivial merge