Merge branch 'MDL-63991-master' of git://github.com/crazyserver/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 10:57:57 +0000 (11:57 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 10:57:57 +0000 (11:57 +0100)

Trivial merge