Merge branch 'MDL-42366-master' of https://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 11:17:07 +0000 (13:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 4 Jun 2018 11:17:07 +0000 (13:17 +0200)

Trivial merge