Merge branch 'MDL-62668-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 18:42:13 +0000 (19:42 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 18:42:13 +0000 (19:42 +0100)

Trivial merge