Merge branch 'stable-0.7'