Merge branch 'MDL-67210-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Tue, 26 Nov 2019 07:29:45 +0000 (08:29 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 26 Nov 2019 07:29:45 +0000 (08:29 +0100)

Trivial merge