Merged 494:495 from `trunk' to `tags/collectd-3.8.1'