Merge branch 'wip-mdl-57344' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 00:56:02 +0000 (01:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 00:56:02 +0000 (01:56 +0100)

Trivial merge