Merge branch 'wip-mdl-56369' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:32:58 +0000 (01:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:32:58 +0000 (01:32 +0200)

Trivial merge