Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)

Trivial merge