Merge branch 'MDL-61388-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:48:56 +0000 (16:48 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:48:56 +0000 (16:48 +0200)

Trivial merge