Merge remote branch 'origin/0.6.2' into 0.6.x