0.6.x merge into master