Merge branch 'MDL-53547' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:30 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:30 +0000 (22:58 +0100)

Trivial merge