Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)

Trivial merge