Code

Merge remote-tracking branch 'github/pr/1973'
authorFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:52:56 +0000 (08:52 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:52:56 +0000 (08:52 +0200)

Trivial merge