Merge branch 'MDL-59015-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 10:19:13 +0000 (12:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 10:19:13 +0000 (12:19 +0200)

Trivial merge