Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 22:29:29 +0000 (00:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 22:29:29 +0000 (00:29 +0200)

Trivial merge