Merge branch 'MDL-55785-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 17:59:20 +0000 (19:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 17:59:20 +0000 (19:59 +0200)

Trivial merge