Merge branch 'MDL-63373' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 10 Oct 2018 10:56:38 +0000 (12:56 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 10 Oct 2018 10:56:38 +0000 (12:56 +0200)

Trivial merge