Code

Merged revisions 640 and 642 from `trunk' to `tags/collectd-3.9.1'