Merge branch 'MDL-62886-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 12:25:26 +0000 (14:25 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 12:25:26 +0000 (14:25 +0200)

Trivial merge