Roll elkdb version 0.6.10
Merge branch 'release/0.6.10' into develop