Merge branch 'master' into collectd-4
[collectd.git] / NEWS