Merge remote-tracking branch 'origin/collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Mar 2018 13:42:12 +0000 (15:42 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Mar 2018 13:42:12 +0000 (15:42 +0200)

Trivial merge