Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd