Code

Merged revisions 492 and 493 to `tags/collectd-3.8.0'