Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 17:52:56 +0000 (19:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 17:52:56 +0000 (19:52 +0200)

Trivial merge