Merge branch 'MDL-62558-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 09:17:06 +0000 (11:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 09:17:06 +0000 (11:17 +0200)

Trivial merge