Merge branch 'MDL-63168_master' of git://github.com/markn86/moodle
authorSara Arjona <sara@moodle.com>
Tue, 29 Jan 2019 12:00:47 +0000 (13:00 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 29 Jan 2019 12:00:47 +0000 (13:00 +0100)

Trivial merge