Merge branch 'MDL-68281' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 07:25:04 +0000 (09:25 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 1 Apr 2020 07:25:04 +0000 (09:25 +0200)

Trivial merge