Merge branch 'MDL-60145-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 16:56:34 +0000 (18:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 16:56:34 +0000 (18:56 +0200)

Trivial merge