Merge branch 'MDL-36424-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:19:59 +0000 (19:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:19:59 +0000 (19:19 +0200)

Trivial merge