Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)

Trivial merge