Merge branch 'MDL-63628-master' of git://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:19:41 +0000 (12:19 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:19:41 +0000 (12:19 +0100)

Trivial merge