Merge branch 'MDL-68715' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 12:31:44 +0000 (14:31 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 12:31:44 +0000 (14:31 +0200)

Trivial merge