Merge branch 'MDL-62620' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:28:15 +0000 (14:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:28:15 +0000 (14:28 +0200)

Trivial merge