Merge branch 'MDL-67196' of https://github.com/stronk7/moodle
authorSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 19:06:11 +0000 (20:06 +0100)
committerSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 19:06:11 +0000 (20:06 +0100)

Trivial merge