Merge branch 'MDL-57687-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 18:14:22 +0000 (19:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 18:14:22 +0000 (19:14 +0100)

Trivial merge