Bump to version 0.6.8
Merge branch 'develop'