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

Trivial merge