Merge branch 'snapshot-release-0.6.0'