Merge branch 'MDL-68451-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Thu, 21 May 2020 06:30:31 +0000 (08:30 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 21 May 2020 06:30:31 +0000 (08:30 +0200)

Trivial merge