fix
Merge branch 'master' of github.com:fabienfoerster/monitoring-collectd