Merge branch 'wip-MDL-61814-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 15:17:47 +0000 (17:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 15:17:47 +0000 (17:17 +0200)

Trivial merge