Merge branch 'MDL-54858-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 15:41:06 +0000 (17:41 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Jul 2018 15:41:06 +0000 (17:41 +0200)

Trivial merge