Merge branch 'master' of git.edu-zg.ch:zeuz/collectd