Code

Merge remote-tracking branch 'github/pr/2034'
authorFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 09:37:57 +0000 (11:37 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 27 Sep 2017 09:37:57 +0000 (11:37 +0200)

Trivial merge