Merge branch 'MDL-40081' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Tue, 7 Apr 2020 13:09:56 +0000 (15:09 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 7 Apr 2020 13:09:56 +0000 (15:09 +0200)

Trivial merge