Code

Merge pull request #109 from tokkee/sh/collectd-5.0