Code

Merge remote-tracking branch 'github/pr/1438'
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 08:24:22 +0000 (09:24 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 08:24:22 +0000 (09:24 +0100)

Trivial merge