Merge branch 'MDL-62730-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:53:42 +0000 (02:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:53:42 +0000 (02:53 +0200)

Trivial merge