Merge branch 'wip-mdl-55258-m' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 10:13:00 +0000 (12:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 10:13:00 +0000 (12:13 +0200)

Trivial merge