Merge remote-tracking branch 'github/pr/1927'
authorFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 13:56:28 +0000 (15:56 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 13:56:28 +0000 (15:56 +0200)

Trivial merge