Merge pull request #2857 from shykes/0.7-release

0.7 release
Merge branch 'release'