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

Trivial merge