Code

Merge remote-tracking branch 'github/pr/1558'
authorFlorian Forster <octo@collectd.org>
Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)

Trivial merge