Merge branch 'MDL-62418-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:17:58 +0000 (10:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:17:58 +0000 (10:17 +0200)

Trivial merge