Merge branch 'MDL-63739-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 10:19:32 +0000 (11:19 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Nov 2018 10:19:32 +0000 (11:19 +0100)

Trivial merge