Merge branch 'snapshot-0.7.1'