Code

Merge pull request #681 from pyr/feature/use-collectd-hostname