Merged 516:518 from `trunk' to `tags/collectd-3.8.2'