Merge branch 'MDL-61838-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:44:05 +0000 (13:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Apr 2018 11:44:05 +0000 (13:44 +0200)

Trivial merge