Merge remote-tracking branch 'github/pr/2006'
authorFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:25:26 +0000 (07:25 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:25:26 +0000 (07:25 +0200)

Trivial merge