Code

Merge remote-tracking branch 'github/pr/1370'
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)

Trivial merge