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