Merge branch 'MDL-63117-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:32:58 +0000 (16:32 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:32:58 +0000 (16:32 +0200)

Trivial merge