Merge branch 'pr/2431'
authorFlorian Forster <octo@collectd.org>
Tue, 19 Sep 2017 06:16:53 +0000 (08:16 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 19 Sep 2017 06:16:53 +0000 (08:16 +0200)

Trivial merge