Merge remote-tracking branch 'github/pr/2391' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)

Trivial merge