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

Trivial merge