Merge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 Nov 2016 10:11:32 +0000 (11:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 Nov 2016 10:11:32 +0000 (11:11 +0100)

Trivial merge