Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:25:06 +0000 (13:25 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:25:06 +0000 (13:25 +0200)

Trivial merge