Merge branch 'dev'
Prepare 0.8.0 release
Merge branch 'master' into dev