Merge branch 'MDL-68833-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 15:57:57 +0000 (17:57 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 15:57:57 +0000 (17:57 +0200)

Trivial merge