Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)

Trivial merge