Code

Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)

Trivial merge