Merge branch 'MDL-63215-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 08:40:41 +0000 (10:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 08:40:41 +0000 (10:40 +0200)

Trivial merge