Merge branch 'refs/heads/0.6'