0.6.x changes into master