Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 May 2020 15:58:39 +0000 (17:58 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 25 May 2020 15:58:39 +0000 (17:58 +0200)

Trivial merge