Merge branch 'MDL-64614' of git://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 19:21:18 +0000 (21:21 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 19:21:18 +0000 (21:21 +0200)

Trivial merge