Merge branch 'feature-riemann-threshold' of github.com:pyr/collectd into feature...