Merge branch 'MDL-68448-master-fix' of github.com:sarjona/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 May 2020 09:37:41 +0000 (11:37 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 25 May 2020 09:37:41 +0000 (11:37 +0200)

Trivial merge