Merge branch 'MDL-61875-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:03:27 +0000 (13:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:03:27 +0000 (13:03 +0200)

Trivial merge