Merge branch 'pr/1609'
authorFlorian Forster <octo@collectd.org>
Wed, 12 Oct 2016 14:57:19 +0000 (16:57 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 12 Oct 2016 14:57:19 +0000 (16:57 +0200)

Trivial merge