Merge branch 'MDL-63711-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 15:35:34 +0000 (16:35 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 15:35:34 +0000 (16:35 +0100)

Trivial merge