Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 2 Dec 2016 13:01:27 +0000 (14:01 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 2 Dec 2016 13:01:27 +0000 (14:01 +0100)

Trivial merge