Merge branch 'MDL-62342-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 12:33:50 +0000 (14:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 12:33:50 +0000 (14:33 +0200)

Trivial merge