Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Mon, 8 Oct 2018 09:52:08 +0000 (11:52 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 8 Oct 2018 09:52:08 +0000 (11:52 +0200)

Trivial merge