Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 16:44:18 +0000 (17:44 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 16:44:18 +0000 (17:44 +0100)

Trivial merge