Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)

Trivial merge