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

Trivial merge