Merge branch 'MDL-31443-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:35:19 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:35:19 +0000 (01:35 +0200)

Trivial merge