Merge branch 'processes' of /var/lib/git/collectd