Merge branch 'MDL-59663-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 19:03:32 +0000 (21:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 19:03:32 +0000 (21:03 +0200)

Trivial merge