Merge branch 'pr/1975'
authorFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:51:50 +0000 (08:51 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:51:50 +0000 (08:51 +0200)

Trivial merge