Merge branch 'MDL-64391_master' of git://github.com/vmdef/moodle
authorDavid Monllaó <davidm@moodle.com>
Mon, 11 Feb 2019 10:08:20 +0000 (11:08 +0100)
committerDavid Monllaó <davidm@moodle.com>
Mon, 11 Feb 2019 10:08:20 +0000 (11:08 +0100)

Trivial merge