Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 06:29:39 +0000 (08:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 06:29:39 +0000 (08:29 +0200)

Trivial merge