Merged revisions 581 and 583 from trunk to tags/collectd-3.8.4