Merge 0.8.0 into master