Merge branch 'MDL-68760' of https://github.com/timhunt/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:33:05 +0000 (20:33 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:33:05 +0000 (20:33 +0200)

Trivial merge