Merge branch 'MDL-63881-master' of https://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 10:37:07 +0000 (11:37 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 10:37:07 +0000 (11:37 +0100)

Trivial merge