Merge remote-tracking branch 'github/pr/1087'
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)

Trivial merge