Merge branch 'MDL-67166-master' of git://github.com/bmbrands/moodle
authorSara Arjona <sara@moodle.com>
Thu, 7 Nov 2019 15:30:18 +0000 (16:30 +0100)
committerSara Arjona <sara@moodle.com>
Thu, 7 Nov 2019 15:30:18 +0000 (16:30 +0100)

Trivial merge