Merge branch 'MDL-59478-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:21:48 +0000 (00:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:21:48 +0000 (00:21 +0200)

Trivial merge