Merge branch 'MDL-63815-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:42:46 +0000 (11:42 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:42:46 +0000 (11:42 +0100)

Trivial merge