Code

Merge remote-tracking branch 'github/pr/1890' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:19:31 +0000 (07:19 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Aug 2016 05:19:31 +0000 (07:19 +0200)

Trivial merge