Code

Merge remote-tracking branch 'github/pr/2490'
authorFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 18:54:37 +0000 (20:54 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 18 Oct 2017 18:54:37 +0000 (20:54 +0200)

Trivial merge