Merge pull request #3061 from hnyman/collectd552