Merge branch 'stable-0.5'