Merge branch 'MDL-63487-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 07:07:05 +0000 (08:07 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 07:07:05 +0000 (08:07 +0100)

Trivial merge