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

Trivial merge