Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:14 +0000 (16:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:14 +0000 (16:23 +0100)

Trivial merge