Code

Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)

Trivial merge