Code

Merge remote-tracking branch 'github/pr/2492'
authorFlorian Forster <octo@collectd.org>
Mon, 23 Oct 2017 13:20:40 +0000 (15:20 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 23 Oct 2017 13:20:40 +0000 (15:20 +0200)

Trivial merge