Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:24:02 +0000 (10:24 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:24:02 +0000 (10:24 +0200)

Trivial merge