Code

Merge remote-tracking branch 'github/pr/2451' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 08:23:40 +0000 (10:23 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 08:23:40 +0000 (10:23 +0200)

Trivial merge