0.6.7
Merge branch 'release/0.6.7' into develop