Merge branch 'MDL-67342-master' of git://github.com/marinaglancy/moodle
authorSara Arjona <sara@moodle.com>
Mon, 25 Nov 2019 14:58:54 +0000 (15:58 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 25 Nov 2019 14:58:54 +0000 (15:58 +0100)

Trivial merge