Merge branch 'stable-0.10'