Merge branch 'collectd-5.8' into master
authorPavel Rochnyack <pavel2000@ngs.ru>
Wed, 23 May 2018 14:25:14 +0000 (21:25 +0700)
committerPavel Rochnyack <pavel2000@ngs.ru>
Wed, 23 May 2018 14:27:07 +0000 (21:27 +0700)

Trivial merge