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

Trivial merge