Merge branch 'MDL-31852-master' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 11:44:44 +0000 (12:44 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 28 Jan 2019 11:44:44 +0000 (12:44 +0100)

Trivial merge