Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)

Trivial merge