Merge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Jan 2017 01:29:49 +0000 (02:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Jan 2017 01:29:49 +0000 (02:29 +0100)

Trivial merge