Merge branch 'wip-mdl-57853' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 20:52:16 +0000 (21:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 20:52:16 +0000 (21:52 +0100)

Trivial merge