Code

Merge remote-tracking branch 'github/pr/1909' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:40:35 +0000 (08:40 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:40:35 +0000 (08:40 +0200)

Trivial merge