Merge v0.6 branch into master.