Code

Merge branch 'collectd-5.6'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)

Trivial merge