Merge branch 'MDL-58428-master' of git://github.com/sarjona/moodle
authorSara Arjona <sara@moodle.com>
Tue, 26 Feb 2019 12:25:54 +0000 (13:25 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 26 Feb 2019 12:25:54 +0000 (13:25 +0100)

Trivial merge