Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2017 01:34:58 +0000 (02:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jan 2017 01:34:58 +0000 (02:34 +0100)

Trivial merge