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

Trivial merge