Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 09:05:05 +0000 (10:05 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 09:05:05 +0000 (10:05 +0100)

Trivial merge