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

Trivial merge