Merge branch 'MDL-63571-master' of git://github.com/peterRd/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 20 Nov 2018 16:19:11 +0000 (17:19 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 20 Nov 2018 16:19:11 +0000 (17:19 +0100)

Trivial merge