Merge branch 'MDL-42779-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 09:42:44 +0000 (11:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 28 May 2018 09:42:44 +0000 (11:42 +0200)

Trivial merge