Merge branch 'MDL-66683-master' of git://github.com/cescobedo/moodle
authorSara Arjona <sara@moodle.com>
Thu, 7 Nov 2019 16:41:22 +0000 (17:41 +0100)
committerSara Arjona <sara@moodle.com>
Thu, 7 Nov 2019 16:41:22 +0000 (17:41 +0100)

Trivial merge