Merge branch '0.6.0.x' into 0.6.x