Code

Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 14:47:53 +0000 (15:47 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 14:47:53 +0000 (15:47 +0100)

Trivial merge