Merge "fix collectd's bug" into stable/euphrates