Merge branch 'MDL-44859-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:06:48 +0000 (12:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jun 2018 10:06:48 +0000 (12:06 +0200)

Trivial merge