Merge branch 'collectd-5.8' into collectd-master
authorPavel Rochnyack <pavel2000@ngs.ru>
Tue, 10 Jul 2018 12:05:59 +0000 (19:05 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Tue, 10 Jul 2018 12:05:59 +0000 (19:05 +0700)

Trivial merge