Code

Merge branch 'ff/libcollectdclient'