Merged revision 6.4.5 from `trunk' to `tags/collectd-3.9.1'