Roll elkdb version 0.6.8-2
Merge branch 'release/0.6.8-2' into develop