Merge branch 'upstream' at 0.8.0