Merged revisions 495:504, 508:509 and 510:513 from `trunk' to `tags/collectd-3.8.1'