Merge branch 'MDL-63823-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 09:09:33 +0000 (10:09 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 09:09:33 +0000 (10:09 +0100)

Trivial merge