Merge branch 'MDL-62237-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2018 12:22:21 +0000 (14:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2018 12:22:21 +0000 (14:22 +0200)

Trivial merge