Merge branch 'MDL-63888-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Nov 2018 12:03:34 +0000 (13:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Nov 2018 12:03:34 +0000 (13:03 +0100)

Trivial merge