Merge branch 'v0.7.1' into master