Merge remote-tracking branch 'github/pr/1980'
authorFlorian Forster <octo@collectd.org>
Tue, 11 Oct 2016 06:36:15 +0000 (08:36 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 11 Oct 2016 06:36:15 +0000 (08:36 +0200)

Trivial merge