Merge branch 'MDL-66062' of git://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 13:15:49 +0000 (15:15 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 13:15:49 +0000 (15:15 +0200)

Trivial merge