Code

Merged branch 'collectd-4'.