Merge branch 'MDL-63480-master' of git://github.com/mihailges/moodle
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 14:18:22 +0000 (15:18 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 14:18:22 +0000 (15:18 +0100)

Trivial merge