Merge remote-tracking branch 'origin/0.6.x'