Merge branch 'collectd-5.8'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Nov 2017 07:33:05 +0000 (08:33 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Nov 2017 07:33:05 +0000 (08:33 +0100)

Trivial merge