Merge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 18:55:23 +0000 (20:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 18:55:23 +0000 (20:55 +0200)

Trivial merge