Code

Merge remote-tracking branch 'github/pr/1942'
authorFlorian Forster <octo@collectd.org>
Mon, 19 Sep 2016 14:14:42 +0000 (16:14 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 19 Sep 2016 14:14:42 +0000 (16:14 +0200)

Trivial merge