CollectD deploys
Merge branch 'working'