Merged changes from revision 314 (branches/collectd-configfile) to trunk