0.7 ready for release
Merge branch 'release-0.7' into develop