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

Trivial merge