Merge branch 'MDL-58063-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 09:05:37 +0000 (11:05 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jun 2018 09:05:37 +0000 (11:05 +0200)

Trivial merge