Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 21:44:54 +0000 (23:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 21:44:54 +0000 (23:44 +0200)

Trivial merge