Merge branch 'wip-mdl-55337' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 11:12:07 +0000 (13:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 11:12:07 +0000 (13:12 +0200)

Trivial merge