Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)

Trivial merge