Merge branch 'release/0.7-M2' into develop
Merge branch 'release/0.7'
Update version numbers for 0.7 release
Fix merge conflicts