Merge branch 'MDL-44646-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Jun 2018 11:07:32 +0000 (13:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Jun 2018 11:07:32 +0000 (13:07 +0200)

Trivial merge