Merge branch 'wip-mdl-57030' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 15:30:39 +0000 (16:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 15:30:39 +0000 (16:30 +0100)

Trivial merge