Merge branch 'wip-MDL-62584-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 14:31:00 +0000 (16:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 14:31:00 +0000 (16:31 +0200)

Trivial merge