Merge branch 'MDL-67167-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 07:50:15 +0000 (08:50 +0100)
committerSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 07:50:15 +0000 (08:50 +0100)

Trivial merge