Merge branch 'branch-0.5'