Merge branch 'MDL-56069' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:34:50 +0000 (16:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2016 14:34:50 +0000 (16:34 +0200)

Trivial merge