Merge branch 'collectd_crypto' into tmp
Merge branch 'collectd_crypto' into tmp