Merge branch 'stable-0.8'