Merge branch 'stable-0.1'