Merge branch 'MDL-53647' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 19:59:23 +0000 (21:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 19:59:23 +0000 (21:59 +0200)

Trivial merge