Merge branch 'MDL-62930-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:28:10 +0000 (12:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:28:10 +0000 (12:28 +0200)

Trivial merge