Merge branch 'MDL-56604-master' of git://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 12:32:38 +0000 (13:32 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 12:32:38 +0000 (13:32 +0100)

Trivial merge