Merge branch '0.6'