Merge pdxcat/collectd