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

Trivial merge