Merge branch 'MDL-68780' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Wed, 20 May 2020 10:58:37 +0000 (12:58 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 20 May 2020 10:58:37 +0000 (12:58 +0200)

Trivial merge