Code

Merged revision 326 to tags/collectd-3.5.0 and the branches