Merge branch 'MDL-58702-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 09:53:21 +0000 (11:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 09:53:21 +0000 (11:53 +0200)

Trivial merge