Merge branch 'MDL-67184-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Sun, 10 Nov 2019 20:48:48 +0000 (21:48 +0100)
committerSara Arjona <sara@moodle.com>
Sun, 10 Nov 2019 20:48:48 +0000 (21:48 +0100)

Trivial merge