Merge branch 'wip-MDL-37977-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:22:01 +0000 (14:22 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 12:22:01 +0000 (14:22 +0200)

Trivial merge